From: Eli Zaretskii Date: Fri, 13 Aug 2010 08:32:13 +0000 (+0300) Subject: Fix compilation error in xmenu.c for non-toolkit builds. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6900^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1e94b515d7cf558e31bfa4751abce3dc9b759fbe;p=emacs.git Fix compilation error in xmenu.c for non-toolkit builds. xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument list to be consistent with menu.h. --- diff --git a/src/ChangeLog b/src/ChangeLog index 309b0818dde..8cc90a6021b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-08-13 Eli Zaretskii + * xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Fix argument + list to be consistent with menu.h. + * w32menu.c (add_menu_item, name_is_separator): Shut up compiler warnings due to mixing of "char *" and "const char *". diff --git a/src/xmenu.c b/src/xmenu.c index 0f42a5f0892..68b442388a5 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2243,7 +2243,7 @@ pop_down_menu (Lisp_Object arg) Lisp_Object xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, - Lisp_Object title, char **error, EMACS_UINT timestamp) + Lisp_Object title, const char **error, EMACS_UINT timestamp) { Window root; XMenu *menu;